Move GDK GL flags accessors to the private vtable

This allows us to use the GDK_PRIVATE_CALL macro inside gtk.

https://bugzilla.gnome.org/show_bug.cgi?id=739781

diff --git a/gdk/gdk-private.c b/gdk/gdk-private.c
index 0dbd035a919e920d7abcde7400a67213f259c0fb..f95b0b8cec05fd2e52fa5ba726dc35a4b912214c 100644 (file)
--- a/gdk/gdk-private.c
+++ b/gdk/gdk-private.c
@@ -9,6 +9,8 @@ gdk__private__ (void)
     gdk_display_open_default,
     gdk_add_option_entries,
     gdk_pre_parse,
+    gdk_gl_get_flags,
+    gdk_gl_set_flags,
   };
 
   return &table;

diff --git a/gdk/gdk-private.h b/gdk/gdk-private.h
index 70616473011bb6e815ce551b2288e42d98782cf8..83de62c72f5457e0490829f4b13471208f09fd0e 100644 (file)
--- a/gdk/gdk-private.h
+++ b/gdk/gdk-private.h
@@ -2,6 +2,7 @@
 #define __GDK__PRIVATE_H__
 
 #include <gdk/gdk.h>
+#include "gdk/gdkinternals.h"
 
 #define GDK_PRIVATE_CALL(symbol)        (gdk__private__ ()->symbol)
 
@@ -16,6 +17,9 @@ void            gdk_add_option_entries          (GOptionGroup *group);
 
 void            gdk_pre_parse                   (void);
 
+GdkGLFlags      gdk_gl_get_flags                (void);
+void            gdk_gl_set_flags                (GdkGLFlags flags);
+
 typedef struct {
   /* add all private functions here, initialize them in gdk-private.c */
   gboolean (* gdk_device_grab_info) (GdkDisplay  *display,
@@ -27,6 +31,8 @@ typedef struct {
 
   void (* gdk_add_option_entries) (GOptionGroup *group);
   void (* gdk_pre_parse) (void);
+  GdkGLFlags (* gdk_gl_get_flags) (void);
+  void (* gdk_gl_set_flags) (GdkGLFlags flags);
 } GdkPrivateVTable;
 
 GDK_AVAILABLE_IN_ALL

diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index f9c874f6eea50ad76cd8e6edb4db8f71710a2c7c..949562e5f42160d79941c7bacc2e4612236c10b4 100644 (file)
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -75,6 +75,7 @@
 #include "gdkinternals.h"
 
 #include "gdkintl.h"
+#include "gdk-private.h"
 
 #include <epoxy/gl.h>
 

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 7ab94c3e466841678047b8a669896d8eeead15cf..c3246818fcb522eb3c1365609a623093e9413424 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -109,12 +109,6 @@ extern guint _gdk_debug_flags;
 extern guint _gdk_gl_flags;
 extern GdkRenderingMode    _gdk_rendering_mode;
 
-/* export these so we can use them from the inspector */
-_GDK_EXTERN
-GdkGLFlags gdk_gl_get_flags (void);
-_GDK_EXTERN
-void       gdk_gl_set_flags (GdkGLFlags flags);
-
 #ifdef G_ENABLE_DEBUG
 
 #define GDK_NOTE(type,action)                G_STMT_START { \

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index f90d41c0ea4bf38c37f92492c486417eaec2ab2f..08bcae4f797d238249f09f3299c01dc154c94fac 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -40,6 +40,7 @@
 #include "gdkframeclockidle.h"
 #include "gdkwindowimpl.h"
 #include "gdkglcontextprivate.h"
+#include "gdk-private.h"
 
 #include <math.h>
 

diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c
index 5706969fb56a6cb98b8c719321c65f7c236a9e82..1a74ad08e02e41cd8b80383d3ac49fd829349568 100644 (file)
--- a/gtk/inspector/visual.c
+++ b/gtk/inspector/visual.c
@@ -34,7 +34,7 @@
 #include "x11/gdkx.h"
 #endif
 
-#include "gdk/gdkinternals.h"
+#include "gdk/gdk-private.h"
 
 struct _GtkInspectorVisualPrivate
 {
@@ -492,7 +492,7 @@ init_gl (GtkInspectorVisual *vis)
 {
   GdkGLFlags flags;
 
-  flags = gdk_gl_get_flags ();
+  flags = GDK_PRIVATE_CALL (gdk_gl_get_flags) ();
 
   if (flags & GDK_GL_ALWAYS)
     gtk_combo_box_set_active_id (GTK_COMBO_BOX (vis->priv->gl_combo), "always");
@@ -528,14 +528,14 @@ update_gl_flag (GtkSwitch  *sw,
 {
   GdkGLFlags flags;
 
-  flags = gdk_gl_get_flags ();
+  flags = GDK_PRIVATE_CALL (gdk_gl_get_flags) ();
 
   if (gtk_switch_get_active (sw))
     flags |= flag;
   else
     flags &= ~flag;
 
-  gdk_gl_set_flags (flags);
+  GDK_PRIVATE_CALL (gdk_gl_set_flags) (flags);
 }
 
 static void